Add TODO
Sketch up server side