Worked some more on the builder syntax