Updated TODO and removed md as of now