Sneaky refactoring at work! :D (NOT FINISHED)