The detailed bulk composition of the Sun, and hence of the solar wind, provides a fundamental data set for planetary science. In order to increase the solar wind implanted into an ultra-pure sample compared to the irreducible contaminants, we have designed a solar wind concentrator. A concentration factor of >20 is achieved by using an electro-optical design that is roughly analogous to an optical reflecting telescope with the additions of ion pre- acceleration and proton rejection. Detailed calculations and simulations using three separate approaches have been used to optimize and prove out the design. In addition, the critical mirror portion of the design was prototyped and tested; results of the prototype testing bear out the basic design of the concentrator and were used to further optimize the mechanical design. While never flown as a unit, all components of the concentrator have substantial flight heritage. The solar wind concentrator design is mature and ready for flight.