HA! Both my ships turned out to be right! I knew they would, I knew it, I knew it, I knew it *does annoying war dance around her now heavily highlighted and written-upon copy of HBP*
Erm...my nickname really is Little Miss Know-it-All, I didn't just make that up because it's like Hermione, although that's a plus...