@sym3tri: Can I address this concern in a different branch? I would rather merge this branch if there are no other issues and then refactor this in a separate branch.