IN PROGRESS --- NOT YET READY!!  -- David.

(The stable-next-week branch)
