Initial work on migration to sebastian/comparator