Visualisation works fine. Next step is refactoring