Sprint 3 Development