WIP. Refs #1