Code Review: Ryan - 2014-03-14

DO NOT MERGE