Massive refactoring - #6