wip notifications now return fine. Need to add params in
Removed some redundant commented out code