almost done, still want to have it in git.