Massive commit

As always because doing incremental commits on windows is annoying