Phase 2 complete. App almost ready