WIP-7: more comments