REALLY BIG CODE REVAMP.