Fixed sort order & added beginnings of notification support