Feature/shiny

still WIP