Project has been refactored. More refactoring needs to be done!