Reintroduce timer controls. Introduce state control