Final commit for part 1