Finished adding cutoff date and all the logic around it