partial commit to pull in evan changes
merged junk