Merge pull request #65 from NickOttrando/nick

Nick
added to load timeline, needs to be tested