Made progress on part 2. Still more work to be done