Made some progress with  issue num 19.