Smoke as a trait

take my changes please