Updated with resources from front end fork