Eliminates some TODOs and makes it so the notifications show up correctly on start up. Justin Canas