Rejig logic so that most is in **_comparisons.py