More work on the a1 and b1 to-do lists.

Leo build: 20141029202140