Cleaning up in preparation for next version of SPMP.
Readying branch for prototype creation this coming week.