branch-taken and branch-nottaken done. I will commit the history strategy in some time.