CODE REVIEW - Ryan

Love how many tests are here. Sad that master has failing tests.