refactored server
Merge pull request #7 from snozza/johnnytest

refactored server