more work to unbreak this
more work for the api refactor
yet more fixes