Scene changes

Working on standard mode, using master for testing.