[NF] Work in progress (#8).