EOD 03/14/14

Finalizing chat stuff