more work on mobility

*paused because mobility server is currently not working