updated app with basic structure