Chris: Unified some code, chat works!