I'm wondering if this should not be a helper