Working on this issue now. Will aim to have a PR after the major code refactor. Currently just exploring modelling options...