Again the col stuff can be cleaned up.  As above, I don't mind if this goes in after the fact, as long as it gets done.