Glad to hear!
1 during NPC's good endings, this will be likely!
2 for sure, when she gets her own route!