merges front and back end updates together ****Working Version****