WIP more fiddling