Model and db

please approve