Working on issue #180 Not finished.