Debugging and got rid of wrapper

Graph added to debugging button.