Done. see my fork