WIP
Fix up TODO comments
Fix up param processing for members, instructors