Closer, but wonky. Trying to move it all into explicit resolves on the $state