I'm pretty sure that's the case... and I won't discount the possibilty either of Cameron being terminated, and then John and Sarah running into some girl played by Summer Glau a couple of episodes later.
I wish Sarah would've killed Andy Goode though... I want to see her kill someone herself, maybe with a pencil or some hardcore shit like that.
I want to see what type of development goes one with the blonde chick in the chemistry class, I'm quite curious on how they are going to use her because I'm quite sure this show won't have John staying in that school very long and that the school scenes will be quite minimal.