Revert "part two: Intermediate checkin"

This reverts commit eb8208665fbbb07cd159d2365676bbcc47e3879c.