Added timer functionality and structure to store relevant data