Push notifications working, moving on to UX