Seems like it. Though I'll hold off on inserting Hanami in that scene for now. Her lunch plans depend on how her part in the commencement ceremony scene resolves.
Thanks. I also were working on a post to advance Class 1-B scene, but couldn't finish it as I had to rush to class (came in the literal last minute). I'll be posting it soon.