More recursive schema work.  Still needs work.