Bring in better codekill build script w.i.p