some progress on part 2