Fixing legacy etl stuff.
Merge remote-tracking branch 'origin/master'
Fixed some dumb things with interactive analysis. Still super broken.