Phase two of Headwaters at the Comal multimillion dollar expansion is nearing completion at 333 E. Klingemann St., New Braunfels.