Feature/crm 14592

initial stab at https://issues.civicrm.org/jira/browse/CRM-14592