Add push and pop state + first attempt to get the name of the section.