Can't get the model.Database to 100% but done otherwise