I feel like a timeskip might be in order. Say, a day or two? I was also thinking of having a witch's assembly happen.