Starting to solve issue #3.