Second Commit. Project almost complete