Merge pull request #24 from wcjohnson11/group-server

Group server
refactor server