finished adding code to timing subfolder
merge with cluster commits