Merge db-integration branch. API now hooked up to the database.