Feature/mysterymachine

@Blackbaud-JosephPoirier please code review this