Move most of this into verdoux