\todo items for @cpadavis re #
\todo items for @cpadavis re #65, #66