Progress Towards a Fire-Safe Cigarette