Adding Pierre's sessions

You have an unresolved merge conflict.