Hacking on reveal state
Start server.js refactor
WIP

Server cleanup and API changes