big azz commit

Lots of stuff over the past few weeks... cant even annotate :/