Finished api, switching to UI