Sorry, been meaning to reply to this sooner (work has been a killer), but yes that's more or less the plan.  Once the morning comes, there'll be a new commotion as the Uesugi decides to take the contracts of the two girls.