Almost done

Almost 100% covered!