Latest version of code.
Fixed conflicts in visualizer.c