More commenting and moving around todos.  Moving onto server.