persistent storage implemented
focus shifting removed