WIP: more fiddling