The actual commit. I think this has everything.

I've removed the conflicts and hopefully this includes what I added.