ben2d2:master ---> zkellerdevelops:benchanges

Merge Ben's additions and changes to Zach's "benchanges" branch.