dimswapper now a static function instead of an op. Swapping still buggy !