wip/svrcore
