file data reads in. populate database not running yet.
database working
fixed merge conflict
fixed merge