[NF] Work in progress (#28).