Code Review

DO NOT MERGE.

For comments, only.
:+1: on validating the rating