Add dy estimation and type 2 categorisation. @benjamin.fischer do you think we can press the shiny green merge button?