Work on build scripts