Major change (may not work correctly)

Bulk checkin to allow work to proceed.