Final Master 5

Changes to App