state machine improvements, all steps before "get versions" done
all states moved under new state machine