Clean up some bus stuff. SelfHandling contract.
Work on a few command things.
Tweak a few mapping things.