Fixed build process, but no real progress on the code.