Awesome... I had avoided roles to keep things easier to understand but will check out the PR.