Testing an OO approach.
Fixing some typos.