Add past state chooser, refactor digraph/network