Putting design back in design/build