Moved notifications into account; untested.