First pass at participant control
merged changes