introduce class passes and clean up accordion.