Some work on #2

 Does this help?