Accordion suppoted, thanks to Francois Viljoen
Revert "Accordion suppoted, thanks to Francois Viljoen"

This reverts commit fea8f9a5618e17727d49bec25cf4afafd292e90b.
Revert "Revert "Accordion suppoted, thanks to Francois Viljoen""

This reverts commit f64e3c6c5392c5031ea829a28cee41c502840d46.