Almost done

currently 11.6 coverage