Replaced timelines. Added timeline marker and movement events.
Code refactoring.