Fixed build file.  I believe this is now complete.