Another partial commit of Danny Cruise changes from Feb. 25
latest changes from danny 2/25