I think we are likely to need to override variables in common, so I suspect this may need tweaking.  In LB stuff, I am keeping it separate, we can compare/contrast once they are both working.