Cleaned Up Slightly in Prep for Big Revision
Begining of Revision
Revert "Begining of Revision"

This reverts commit dfd5f31325f8dc4d312739f33798acd17112b600.