super giant mega commit but i think it all works?! now to work on new blueprints (newprints)