start to cover situations when user has no connectivity - also make states work better (internal sub states weren't matched well before)