Part 2 done, code review not yet completed