Revert "Undo Previous Changes"

This reverts commit e7ca7955e97f50bf31fdf7360ab39a9a2533b047.
Revert "Moved Code"

This reverts commit 90bcebf78eb0a44be96b9bcfd4781963a5cb681c.