ton of rework to make the merged mods function