CODE REVIEW: ryan

DO NOT MERGE @thejessleigh @jbwilmoth 

Overall, very good code.