Working toward unifying WorldModel and AGMModel classes (branching was a really bad decision)