Team project - Almost Finished MajorChanges