new accordion stuff with toolkit restructures merged