First stage refactor to include 3 answer history
More refactoring, history tests failing
5th question test pass