CODE REVIEW, Ryan

Failing tests in master make my sad :panda_face: