Started adding timer feature