done...almost