Got some additional Parse things
Got some hackey user and group shit
Fixed merge results