Working on build scripts