Beginning to start some refactoring
More refactoring