Another, slightly more complicated scene, plus a little bit of refactoring.