Revert "Massive Rewrite"

This reverts commit d65ec4e93869183bfde2adb4ee6572dee552ddb2.
Recommit