added a ton of stuff need to work on collabrify a little more