stuff
wip - cleanup - better api