Sprint-1 Deliverable

Merging sprint-1 into master for the deliverable