Refactor Google Upload to Drive API, initial attempt at XD (incomplete + commented out)  #20