attempt1 at joins
add assign 7 changes
Merge branch 'cascadetime'