Fixing interactions
Merge pull request #153 from diceydawg/umass_branch

Fixing interactions
fixing merge conflicts