Attempted groups for chat.. but broke it (kinda). A little code cleanup as well