Refactor 2d

Ready for merge.  Lookin at you, Caswell
should be `title = messenger_class.__name__`