Preparation changes

Changes made to files in preparation for session.