First cut of full schemas

Fixed