Added classes and prepp for pause