Wip

Complete refactor done! Let's hit the dancefloor!