added basic logic for scenes 3-7. It's like we're almost done, right? Right.
Merge remote-tracking branch 'origin/master'