Visualisation is basically working, but still needs small fixes