@nchapman - what do you think of a follow on PR so we can discuss this with UX?