Even more work on Part 3