migrated over to GoAPI structure