* More work on SceneManager