New issue nearly finished. So close yet so far