First cut of full schemas

Yep, fixed