Fixing some issues, took out view exchange for now.