More work in #550 (wip)