Finishing up with build-script