Merge Part 1a branch into the proper file for submission