Basic ticker
Fixed up timeline
Merge