Refactored and tests pass including concurrency spec

Now increments/decrements actor total immediately instead of during merge to combat stale sibling issues.