latest WIP on v2
latest reworking gubbins