Sprint 1 changes commit

Sprint 1 pull request