Even more stuff
Revert "Even more stuff"

This reverts commit eb7f120184cd900077ab3cc69aae5dbc2500981c.
Merge branch 'NewMaster' of https://github.com/TeamInversion/Inversion into NewMaster