Improved timeline behavior, but thinking it needs a bit of an overhaul... sigh