Server now has a ctor to take a dictionary
Removed some includes, added some scaffolding to server
protection for our private parts!