Removed magic in comparator importing

Begin exposing on whittles