Adding schedule dates and failsafes when building