More progress on handlers