adding more to tutor, prep to merge conflicting changes
Merge remote-tracking branch 'origin/master'
reverting to JJWs changes