code review 11/11 - do not merge

alyssa will follow up with a javascript-focused code review