not finished db restructure