Initial work on multiple accordion support