Started moving things to SIMPLE_SEND_MAPPED so that they're more unform
and categorical