Parametric

Merging back in many of the improvement from back to basics and parametric