Working on issue #3.