This feels more Ruby-y. @mistydemeo or @jacknagel, thoughts?