Added Redecision Protection
Updated TODO
Updated TODO