Auslagerung
Merge with Visualization
Cleanup