More architecture detail

See the TODO notes for next steps.