Started working on sending all the necessary info to the API layer and reducing queries