Split into components
Merge branch 'master' of https://github.com/edmarriner/Chatter