Move GA code to a partial