WIP. Laid out current work to be done. Refs #29