A bunch of work.

Worst commit message ever.