Add needed imports, lots of viz stuff.
Fix more errors. We're not going to finish.
merge