Assigned to @karthik

Update 06/18. I'm done working through most of the comments. I have a few sticky ones that are not as easy to resolve so I'll leave them open as I work through more edits.