I'm committing en-mass cause I'm working remotely on two machines and this
is the only way I can do this. I'll be rebasing this soon. Do not work on
it.