*working on issue #8 - First progress but still not finished