Same order of subsections for every issue. A few TODO's added
Now code should look all the same. Another todo added