Cleaned. If overlap, gave pref to IP over OP. Prepped for merge.