Redid all changes except eviction algo, still passing all but 2