Add some server side support for moving