[In Progress]: Making changes to datamodel such that it produces a hierarchical timeline data model