Joe has implemented this feature (: