WIP: TODO notes for Upstatement design