copied more code that will be needed later for server
Merge pull request #190 from tbrockman/master

copied more code that will be needed later for server and deleted an unused test file