add bulk diffusion
consolidate exhaust class