About to make a scary change to the state class...