committing Ray's 12/7 changes on a new branch.