First cut of full schemas

Agreed - rebased