Greenglow

merging the timeline changes in greenglow into master.