Final Sprint 2 Commits - Ready to Merge