Progress on make-script