Graphs and db work but need finetuning