Finishing Demo App Portion