WIP reintroducing $add and $mod