First attempt at re-implementing offline behaviour