More work on build script