Simpler history implementation. A bunch of history tests (some not passing).