History logic is almost done