Stack committed. Chapter 3 refactored...
... and committed.