Rev1 Prelim

Structural work and cleanup to support the rev1 API