TODO: merge with other issues TODO: evaluate #84 in light of this goal
TODO: merge with other issues
TODO: evaluate #84 in light of this goal