I'm wondering if this should be here, or in separate class?