[NF] Continue work on task (#27).