Create scene 7.
Create a working version of scene 7
Merge branch 'scene-7'