update again. trying to pull things together
Merge branch 'tessbranch'