Hello @dyb I am making a new merge request with the conflicts fixed.
We need to revisit this branch when we want to address issue #1
Cheers
