Split/add and fixes

Shouldn't this be `store`, rather than `modulestore()`?