Started working on the api on the client side