Adding booklist - integration of Martin's code.