last stage before server work
last working commit before server stuff
Merge pull request #28 from schrockblock/feature/bmackall/lastworkingbranchbeforeserver

Feature/bmackall/lastworkingbranchbeforeserver