Have mostly working collab stuff.  Still have some random crashes