Updating and fixing all the things.
Merged Dannys notification code.
2 tests failing, but things are looking up!