Terminal sessions

I sense a disturbance in the force. I will face conflicts for this MR on collaboration branch :)