Extended Server class
Merge origin/master
Pushing changes before structural overhaul