Greetings, please finalize refactoring in `refactor` branch and merge it back into `master` to ease hacking on this.