Finished adding Goose. Remerging and refactoring API interface access