Update App in Preparation for PR - Refactoring and Spec Changes