Issue 37

Simplifies everything about the system.  All changes tested against TTORP on CrazedSanity.com, appear 100% backward compatible.