Added skeleton state machine to app