Reducing the number of country and state options
Restoring the old checkout, but NOW our new checkout is broken
Overring before_address to conform to our new checkout as necessary
Patching up some more address bugs