Revert 9a1d749..baad89a

This rolls back to commit 9a1d74955709ae98ed1ca17b31b71a0402388913.
Mostly Fixed

Need to clean up variables so there is the least amount of spots to
update.