Merge pull request #25 from Adrian2014/timeline

Timeline
More changes to match porject direction
Merge pull request #26 from Adrian2014/label_upgrade

More changes to match project direction
changed things to allow future changes
Merge pull request #27 from Adrian2014/label_upgrade

changed things to allow future changes
Merged with master