Minor restructure
Visualizer placeholder