Popout graph now available
Fixing merges
Fixing merge conflicts