Working on issue #17. Alle relevant sections seem to be jsdocified in one way or another