recent commit, almost done