Starting to cleanup code so that it conforms to what documentation says
Fixing broken code that was breaking a bunch of tests
Cleaning more code and replicating changes into the Email class