Agree, i hope we get the chance to switch companions at any point and find new ones in later acts.