The Center for Optics Manufacturing is developing computer-aided manufacturing technology to produce affordable high quality spherical and non-spherical optical surfaces. Advances in MRF (magnetorheological finishing), a computer-controlled deterministic finishing technology, now demonstrate a capability to polish plano, spherical, aspherical, and cylindrical optics, with round or non-round apertures, to better than 0.05 wave p-v (peak-to-valley), 5.0 Angstrom rms surface microroughness, and no subsurface damage. MRF is a paradigm shift in optics manufacturing that redefines the capabilities of the industry and will ultimately enable the affordable manufacture of any freeform optical shape.