Switching some defs over to vals
Precalculating Message targets instead of getTargets method