Began basic work on Session, fixed minor compatibility issues between classes