Data generalization mostly complete
Added forgotten exceptions file
Slight file reshuffle
Changed toString back to how it was