Finish basic ga support addition, close #2