Build a better Bookshelf