I am trying to get back to a working state that I had a few commits ago

This reverts commit e3d9640025f833f8195e0c0847568730d76ffdb1.
Revert "merged maxes changes" -- omg please work

This reverts commit 6316fa4320757a3e8083e847625074e6f5ab7be6, reversing
changes made to e3d9640025f833f8195e0c0847568730d76ffdb1.
quagmire over. compiles, all fixes incorporated