0003. Chapter 2 was started. Some refactoring performed.