25th Iteration

Fixed bugs for when trying to run on the weekend