Added some TODOs in the sidebar