made models validatable
merged with bo's