merged front end with back end (still working on singular entities)