initial check-in for tab refactoring.
Checkpoint for CMS-side changes.