Thanks for sharing your thoughts Matt.
I agree the best option would be to a create a new user state. I’ve been checking out the code and this seems to involve more work than I can do at the moment though, so for now I will file an issue / feature request so we can work on it for future releases.