First cut of full schemas

Nope, rebased