Big refactor to start thinking in terms of a Project object with methods