Started to try to add Add Remove Section support