Added automatic database population.
Fixed conflicts due to formatting.