Initial commit of the builder code