Manual merges and other weird tinkering

Yes I am committing nonworking code. Bite me.