Mode switching and state persistance is broken, trying to rethink this