Commenting, refactoring
Merging conflicts in interactions.js