Added field/schema stuff, but it's time to start over