Updated version of !6 (closed), with fixups based on the work of Bilal Elmoussaoui.
Closes #10 (closed).
This will create a new commit in order to revert the existing changes.
