More progress towards refactor and server integration.