re #6 functional WIP.