code review from anne

Here is your code review - don't merge!  Look for CR comments throughout the code