final commit, too long, too hard