@edwlook can we namespace these?