Should this live somewhere else?