Updated TODO
Created all blocks