Updated most of the strcture. Sorted out the conflict.  Just the regression that may be removed as it does not add much.