Merge pull request #25 from wcjohnson11/group-server

refactor server