Yes, definitely, but not sure if this belongs in this PR or if a separate commit should be made. ping @samccone