More Scene refactor.