Volunteer management

Merging to solidify current build.