Cleaned up TODO
Updated TOOD