6m now generates usefiles.

    This should simplify and speed things up.