CODE REVIEW: Ryan

DO NOT MERGE @devdame @estensland