Committing the hacky external trigger switch and boobtendro changes