Database Clear/Fill almost done