#592 - address comments I added to Andrew Collins' PR, TODOs for some of the items in my proposal