New four-way stops will be ready before students return