initial work on app restart support