first cut restructure to 4.2 - in progress
fixes on IPN process