a bunch of changes
yep
removed the correct thigns :/
merged - the epic, the one, not the final though