Accordion part updated, almost works, but still buggy.
Merge pull request #36 from mr-mr/ccbranch

Accordion part updated, almost works, but still buggy.