Got accordion working again
Merged with remote