bringing things closer to pnp, drastic overhaul of a lot of decisions made to date.

Then perhaps once things are smoothed out, maybe add some of those things back slowly but more carefully.