Adds to #107 and #102