Did tons of work

And made a very creative commit message...