Updated TODO and navigation. WIP