almost done finalizing history navigation