More progress on modals.