Update LRU and added some TODOs

Update LRU and added some TODOs