re #1 - WIP