Another little step toward completion

:tanabata_tree: we'll get rid of all those @TODO's one day :tada: