Scaffold out scene class fixes #5