Implemented triggers to ensure calculations aren't one message behind
 Refactored expr back to a simple + object