Sprint 2 Finalized Code

See latest commit details.