Massive overhaul of Intertwine features to improve migration between environments