Merged all branches together as of the start of our meeting.