Should this get moved to partially found?