Fleshed out more of builder