MOve methods into CRM class