WIP, make work with Biblio.