[ch2] updating passing scenes

Still missing some things, but it's got the basic layout done.