finish adding collapsibility and saving collapse state to deliverables