FinishLine: Work on state machine