Further progress on Build.hs