Database Handler almost done