Revert "Sprint 1 Changes"

This reverts commit 369cb62bfdfba2ffc94443d7c19522f6adbed4cd.