partial server movement, id refactoring
server movement