Huge Commit - Transition to New Way

I'm going to bed now……