did some more TODOs and TOODs