One and Many, Local and Remote refactoring