changes
fixes/merge
changes
fixes
sick new viz stuff