Resque working. Added notes about notifications
resolve merge conflicts
STILL WORKING
resolve merge conflict