CODE REVIEW: Ryan

DO NOT MERGE @alexcodreanu86 @To-mos