Added the goflymake stuff.