Major Rewrite

Complete rewrite of the accordion