guide progress
Merge branch 'master' into tyler
need to fix session situation
sessions fixed