Sprint 2 and Updated Code