Further refactor.  Tested.
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge