Yes, one day I'll probably finish that story (in fact, it may become a book, depending on what happens with Accidental Terrorist), but I'd say you're on the right track there.