database and models now work as expected