More staging commits. Now it builds.