This is already on Mahz's radar when he has time.