[TASK] Complete Sprint 1