FinishLine: work on state machine