I don't think we're going to see much of anything at Hogwarts in the next book. Popular consensus is that Hogwarts is closing down this next year in honor of Dumbledore's death. It might have something to do with the return of Voldemort also. Imagine it. Supreme evil on the loose, its arch enemy at your child's school, would you let your loved ones go back where children have died, instructors have turned evil and the headmaster has been killed? I think its safe to assume they are closing down next year.