finish first pass of schema