Cleaned up and got initial state of codebase working