Dimensional swap

You attempt to warp space to switch the positions of several creatures you know the exact locations of within range. You may target up to 8 creatures, including yourself. Each unwilling creature makes a charisma saving throw. If the creature fails the saving throw or they are willing, you may swap their position with another creature affected by this spell. This spell does not affect targets if they would be transported to a space too small for their size, or would otherwise be injured from the switch itself, such as swapping a creature with no fire immunity with a creature currently in a fire. 

Using a higher level spell slot: You may target 2 additional creatures for each level above 3rd used