Now pulls authors and some refactoring