Intermediate commit of changes. This will not build.
More intermediate changes.