interaction analysis removed to be put in later
merge conflict resolved
some ia stuff
Merge branch 'master' of https://github.com/sjurlur/master