Ezra/apiv1

Update to new API system