Added basic timeline
Filled timeline
Fixed conflicts