Revert the api. It was awful and the app now seems unstable.