Stashing work on shiny before MSAB
More shiny stuff