Column unification

Created by: frankduncan

Big change, and has already been pushed into production. I'll merge in a few days if you don't have a chance to look at it. There's a matching pull in torque.