Refactoring

Damn huge refactoringgggggggg