Timeline edition

Added in class 10/15/14