Refactoring to use components, book completed