Add: dedup, non-conversion, basic for bundles. Code needs refactoring