Final tested code for Sprint 1