Something weird with modals, made progress on the comparative features