Finished! We have everything in the API dir implemented except GCM