Project 4 solved, final commit.