more architectural work on scenes and scene manager