Refactored for easier code maintenance.
More updates
Merge pull request #1 from rtepowers/feature/UserChat

Feature/user chat