re #11 - WIP