Flattening.  Build works and tests pass.
Fix last commit.