Forgot to commit, lots of preliminary code in here
Merge pull request #6 from cjbrowne/server

Merge preliminary Server code from working branch