a whole bunch of commits for the shiny server. Don't judge my lack of git skill!