Feature/bug3

@Blackbaud-JosephPoirier please review this