Part 2 done and working