Added quick join functionality as well as the beginnings of some other things