Adding to lists when offline
Tidied callbacks