Server build. Continuing refactor away from client.