Changed to Database Use, first tests ok, but much to do!