The quark-diquark rovibron and baryon spectra