Mostly on the right track, but need to revisit after talk with Professor Genesereth