'state' is such a confusing name for this throughout the application (I know it's not part of your branch). Maybe we can start here in calling it something more appropriate?