fixed state bug, should be ready to go now