Work in progress on scene management