Update Master to Export/UI Changes

Do you think we need to test this further?
Perceived complexity for to_graph is too high. [20/7]<br>Inconsistent indentation detected.