Phase 2: Additional Features and Expansions