Strip down to bare bones on server side
Merge pull request #1 from StewartAtkins/master

Strip down to bare bones on server side