Minor progress on set 2 challenges.