Version for Douglas to merge with.  8cD  Has ANNIE comments where hte important stuff is