Refactor for multiple objects

Then abuse the power and put lots of objects in.

... Might have gotten a little carried away
Merge branch 'master' of https://github.com/UniversityComputerClub/Branding

Failed to "pull before you push". Again.