that's more of the domain of a real "2.0.0" at this point. but internally we can begin moving toward that model