This fixes #102 (closed), and partially fixes #77 (closed) (still needs initial module setup I think).