Final Update to include working App