Interim commit for minor cleanups in code. Modified event struct to have fields for time started and timeout values. Implementation still needs to be completed.