Removing nested if
Defer seeking until the time is known
Brought TODOs more up to date