The Second Big One

Just Trying To Make This A Bit More Coherent
Revert "The Second Big One"

This reverts commit dbf05c3008ea25725604a86719ed70ea5be011e9.