store all address/label pairs in a dict for easy lookup, also change how lookups are done to accomadate messages from self to a channel (for example)