Finished a merge. Too much patching for my likes