Scratching an itch: started #78
wip #78