Dev free server - suggested revamped design

Lots of stuff to discuss in the new design.
Isn't this just a specific case of keep_merge?