Working Timeline

Fixes #56