redid the formating and included a few extra functions in parse_timeline