working push notifications
first commit
push for merge