moved Estimate wrapping to its own file