Dev free server - suggested revamped design

Lots of stuff to discuss in the new design.
I think there's a lot here that isn't used.  When tests are updated, check what isn't covered and see if it can be cleaned away.