Added timer capability, still needs testing