You ok with it if I save that for after I get this first pass tested and deployed on devel? I may discover other changes along the way.