some sort of actual progress here...
wip