Made Most Changes: Not tested

Will need to to do some testing but major changes made to accomadate
testing for previousDay.