It wasn't part of the original story so would prefer another PR if possible.