Finished merge

Seriously, saving. I need to do that.