Gets spin state working, adds goal state