changed some naming
starting on timelining stuff