HARD Re-commit of everything. A super sloppy way to merge