In a better place to have swappable $!current-grid