Incremental development.  Tests working.