Some progress.  Still doesn't build.