Last update before scrottie starts contributions, branch and merge after this point