rejig collision-drag model code

- runs but needs testing