code review from Anne - DO NOT MERGE

Here is your Code Review - Look for # CR comments throughout the code.