Cleaned-up.  Almost done on branch b1