Updated the newest codebase. Ready for phase 4