Merged w/Cdiff data; created timevars
1st commit