Yep there was definitely a lot of motion in this PR ;-)

Thanks for reviewing!