Begin move to builder pattern to replace nasty overloads