modularity - still having event watcher problems:
Merge branch 'master' of github.com:sampurcell93/Drag-and-Drop