Part 2 nearly finished