Begin adding timing and time set logic