Add vs. going to
Add "at the time of"
Improve "is going to"
Add simple_future