prettier form, more dynamic fields, more robust models.js