Reworked states to run through State classes