Make it more datashaman-ey