Start specifying grid scenes, minor refactoring