Interest in Charmonium spectroscopy has revived over the past few years with the results from the B-Factories. Many new states have been observed. While some of the new states are understood, some are not. I will present a complete review of Charmonium and Charmonium-like spectroscopy and will show the latest results from BaBar. Thirty years after the discovery of the Upsilon resonances and the bottom quark, BaBar has made the first observation of the bottomonium ground state, the eta_b. I will present details of the observation.