Mu huge changes.

Can you pls review as discussed?