Merge branch 'development' of C:\Users\Steve\IdeaProjects\crazy-octo-cat with conflicts.
Cleanup.. This might be a good point to revert to if i break something.