Refactored CRM a bit