First complete take on Issue #111