Revert "Beginning some changes"

This reverts commit 4e6ce2b423bce3e52b2d3175efd4f634ded8c7c0.