Intermediate check-in of changes EB & SG did together.