issue #77 almost done