Check in Gail's work-in-progress for two-up display, so we can switch to flvc branch