Cool, I'll revisit the code and update the PR when I get some time :)