Updated TODO
Tried to cut down memory usage