Merging with Lauren's code

https://github.com/lmccart/everything-but-the-chat