Added partial messaging functionality.
Fixed some merging issues after Messaging commit.
whoops was working on wrong branch for a min
fixed my almost merge fuck up
margin change
all my shit and your shit mergeed an hour and a half later