Demo ready

This branch should be called "almost demo ready" :bowtie: However, the pre-populate link form relies on another branch.