Rework the Builder, add validation.
add link