Worked out timer issues