updating TO DO list from native_crm branch