Closes issues #22 & #26. Improves #23 but does not close it yet. Co-authored-by: fred.boniface <fred@fjla.uk> Reviewed-on: #32