lots of work on the builder script