Add Amir's Go client