CRM

A crapload of changes