Unit recode update

This isn't working yet, it's just for me to transfer to my testing env.