Andrew merge in shiny

Merging in shiny stuff that couldn't wait for this overhaul get onto prod.