Attempt to remove some complexity from the time management methods