Major refactoring. Broke some tests.
more refactoring
new script to get graph annotation
refactor done