What's with all this state? :fire:

Is there any reason we want to change from the original implementation of this?