Updated application with base working code