Started at GCM stuff
More GCM stuff and merge