update goat stuff to be the new goat v1 syntax