This needs a substantial revision, but shouldnt' need too much additional effort. Due by end-of-month.