Initial pass at finishing CriminalIntent