Andrew merge in shiny

Merging in shiny stuff that couldn't wait for this overhaul get onto prod.
This worries me, let me look into this one. These are just place-holders, but I think this should be filled out either way.