WIP: work on #69 and #70
Resolves #69 and #70