Glad we're on the same same page yet again. No roomies.
Also, I had an idea for the Headmaster I hope you like. Here is my idea in a nut shell.
Morgan Freeman+Powerful Precog Abilities!
What do you think? Part of my idea about him being able to see the future I hope to tie in later in the story. Maybe.