Started work on separating out comparators