First draft of a more powerful builder design.