WIP: Fixing GCM registration #2
GCM not working yet