Additional refactoring, add bookreport 1