Revert "Committing Milestone 3"

This reverts commit 73a9c7431efb90f75758679ea5360b6afbe94bde.