Working on #17 far to be completed , but it is a first step..