This could also be combined with the tag and note system described in #39...
This could also be combined with the tag and note system described in #39...