I could just mention a couple of other things, which is about the motivation element. Rather than adding bricks and mortar, I would explore—and I'm not an expert in the subject—looking at the actual behavioural elements of the students and what is motivating them, what is their desire when they come into the class, and what keeps them there.
I'll pass on to my colleague.