Total refactor started