database and model in pretty good shape now