added eviction policy using lists
preparing for pull
merged with lottie's changes