Original branch

Makes a branch with all changes to the M2 code reverted