Add count to section title
Add thorough todo