MESSAGING WORKS (and some style and stuff
Merge pull request #27 from daynedavis/ben

MESSAGING WORKS (and some style and stuff