jtong - add would and when word in logic DSL
jtong - add all for when