1st pass of direct detection formalism finished