Revert 7ca804b..df24416

This rolls back to commit 7ca804bbdf035e390ba3ca07f1f81e02947368a5.
Okay this has the actual bug reporter and no merge conflicts either
Added notifications. Untested and unimplemented
untested notification sender
Jon's merge