Starting to switch out the GDS calls for GA