Part 2 more or less completed