Working on backend & front-end