Just Assisting

Merlin knows Minerva McGonagall would never let the first years go into the second grade curriculum with the war as their first year. So she comes up with a brilliant plan: former seventh years have an optional eighth year where they can learn the actual seventh year curriculum, then the former sixth years go into seventh like normal, then also have an optional eighth year, same with sixth, fifth, and so on. Until the first years from the war graduate after eighth. Then the seventh from that year graduate, as well. Everything goes back to normal.
An unexpected bonus: only the ones who actually care come back for eighth year. Meaning they can have smaller, more interactive classes. People actually ask questions and, more importantly, they really learn. This leads to people selecting classes they really care about, while still taking other classes. Certain people can finally know what they want do, without input from the pressure of others. Just doing what you love can get you far in life.

Drarry/linny/blon/pansmione/aroace!neville/
Cover art by yu-oka on DeviantArt