First cut of full schemas

Rebased