Started refactoring, broke it all :)