Owen,
you progress looks really good. Congrats! Some general comments to the code style: Please avoid overlong lines (i.e., lines longer than 80 characters if possible). Especially if working with git repository viewers like `gitk` or inspecting merge requests on the gitlab web page this is very helpful. Werner