Refactored code... thinking about resolving mergers