add notification
change sort order and tests
Merge branch 'change-sort-order' into add-notification
Merge branch 'add-notification'