Working on TOM comparisons, as well as cleanup..