Higher-level helper functions

Good catch! :flushed: