We should see if there's any code reduction/simplification we can provide by sharing more code across stores or wrappers