Starting to develop fix for scheduling not supporting long time scales