progress towards #398
still some other stuff to catch here