A start for #78

Lots of stuff remaining…