Implement time gap fully
Implemented timegap functionality
Attempting to fix merge error.