Refactored Chat and started refactoring ChatManager
Merged with Shane