Updated with Future Plans, plus app factory