Adding the interesting stuff
Merge pull request #1 from david-davidson/server

Adding the interesting stuff