Bastion: moving over org switcher and adding tests.