Fixes #68 | Some work on #28