Break out model and database population to separate files