diff --git a/docs/projects/Pokedex.Online/PROGRESS.md b/docs/projects/Pokedex.Online/PROGRESS.md
index 5cf24e2..c50bd78 100644
--- a/docs/projects/Pokedex.Online/PROGRESS.md
+++ b/docs/projects/Pokedex.Online/PROGRESS.md
@@ -5,11 +5,11 @@ Last Updated: January 29, 2026
 ## Summary
 
 **Total Phases:** 12  
-**Completed Phases:** 5 ✅  
+**Completed Phases:** 5 ✅ (Phase 6 in progress - 5/6 complete)  
 **Total Steps:** 68  
-**Completed Steps:** 35 / 68 (51.5%)
+**Completed Steps:** 40 / 68 (58.8%)
 
-**Test Suite:** 326 tests passing ✅
+**Test Suite:** 403 tests passing ✅
 
 ---
 
@@ -222,52 +222,64 @@ Last Updated: January 29, 2026
 
 ---
 
-## Phase 6: ChallongeTest Refactoring (0/6 complete)
+## Phase 6: ChallongeTest Refactoring ⏳ (5/6 complete)
 **Duration**: 4-5 days  
-**Status**: Not Started  
-**Target**: Reduce from 1832 lines → ~500 lines (73% reduction)
+**Status**: In Progress  
+**Target**: Reduce from 1795 lines → ~500 lines (72% reduction)
 
-### ⏳ Step 22: Extract useChallongeClient Composable
-- [ ] Create `src/composables/useChallongeClient.js`
-- [ ] Extract API client initialization
-- [ ] Extract auth token management
-- [ ] Support v1 and v2.1 API versions
-- [ ] Write comprehensive tests
+### ✅ Step 22: Extract useChallongeClient Composable
+- [x] Create `src/composables/useChallongeClient.js` (195 lines)
+- [x] Extract API client initialization with smart auth selection
+- [x] Extract auth token management (API Key, OAuth, Client Credentials)
+- [x] Support v1 and v2.1 API versions with reactive switching
+- [x] Support tournament scopes (USER vs APPLICATION)
+- [x] Write comprehensive tests - 10 tests passing ✅
 
-### ⏳ Step 23: Extract useChallongeTests Composable
-- [ ] Create `src/composables/useChallongeTests.js`
-- [ ] Extract test execution logic
-- [ ] Extract result state management
-- [ ] Support multiple test types
-- [ ] Write comprehensive tests
+### ✅ Step 23: Extract useChallongeTests Composable
+- [x] Create `src/composables/useChallongeTests.js` (269 lines)
+- [x] Extract tournament list loading with pagination
+- [x] Extract result state management with useAsyncState
+- [x] Implement search/filtering and detail loading
+- [x] Support v1/v2.1 API differences
+- [x] Write comprehensive tests - 11 tests passing ✅
 
-### ⏳ Step 24: Create ApiVersionSelector Component
-- [ ] Create `src/components/challonge/ApiVersionSelector.vue`
-- [ ] Implement version toggle (v1/v2.1)
-- [ ] Show version-specific features
-- [ ] Add configuration options per version
-- [ ] Write component tests
+### ✅ Step 24: Create ApiVersionSelector Component
+- [x] Create `src/components/challonge/ApiVersionSelector.vue` (191 lines)
+- [x] Implement version toggle (v1/v2.1) with radio buttons
+- [x] Show version-specific features (per-page, scope selection)
+- [x] Add tournament scope selector with info badges
+- [x] Conditional rendering based on API version
+- [x] Write component tests - 13 tests passing ✅
 
-### ⏳ Step 25: Create TournamentGrid Component
-- [ ] Create `src/components/challonge/TournamentGrid.vue`
-- [ ] Implement tournament list/grid display
-- [ ] Add search and filtering
-- [ ] Support pagination
-- [ ] Write component tests
+### ✅ Step 25: Create TournamentGrid Component
+- [x] Create `src/components/challonge/TournamentGrid.vue`
+- [x] Implement tournament card/grid display
+- [x] Add client-side search and filtering
+- [x] Support pagination with "Load More" (v2.1)
+- [x] Display tournament state badges
+- [x] Handle v1 and v2.1 response formats
+- [x] Write component tests - 26 tests passing ✅
 
-### ⏳ Step 26: Create TournamentDetail Component
-- [ ] Create `src/components/challonge/TournamentDetail.vue`
-- [ ] Implement detailed tournament view
-- [ ] Show participants and matches
-- [ ] Add expandable sections
-- [ ] Write component tests
+### ✅ Step 26: Create TournamentDetail Component
+- [x] Create `src/components/challonge/TournamentDetail.vue`
+- [x] Implement expandable tournament detail view
+- [x] Show formatted JSON of full tournament data
+- [x] Handle loading and error states
+- [x] Add smooth animations for expand/collapse
+- [x] Write component tests - 17 tests passing ✅
 
 ### ⏳ Step 27: Refactor ChallongeTest Main Component
 - [ ] Update `src/views/ChallongeTest.vue` to use new composables
-- [ ] Replace inline logic with extracted components
-- [ ] Verify all functionality preserved
-- [ ] Update tests for refactored structure
-- [ ] Confirm line count reduction (1832 → ~500 lines)
+- [ ] Replace inline client logic with useChallongeClient
+- [ ] Replace inline tournament logic with useChallongeTests
+- [ ] Replace inline API controls with ApiVersionSelector
+- [ ] Replace inline tournament list with TournamentGrid
+- [ ] Replace inline details view with TournamentDetail
+- [ ] Verify all functionality preserved (manual browser testing)
+- [ ] Create integration tests for refactored component
+- [ ] Confirm line count reduction (1795 → ~500 lines, 72%)
+
+**Note:** All component building blocks are complete and tested. The main file can now be refactored by replacing inline logic with the new composables and components. This represents significant progress toward the 72% reduction target.
 
 ---