Merge pull request #26 from drewguild/mbeal/submituser

 im tired
Fix things derr...
Merge pull request #27 from drewguild/DG/misc

Fix things derr...
Shit n stuff