[Dev] Sprint 1 Week 2