Restructured some things, started work on visualizer