Got rid of the state, now in its own file
State in its own class