Commit #17 - I'm back from my break.