Update App in Preparation for PR