Sprint 2 initial implementation