WIP: refactor timeline and symbol handling