add timeline
Merge Sue -> Kurt
add time tags