Cleaning up gross constructors - trying to consistently use builders.