Got rid of the state, now in its own file
State in its own class
Added an __init__ file to cleanly impor things