Dev free server - suggested revamped design

Lots of stuff to discuss in the new design.
TODO: Remove unneeded code