Start fixing do-end
Got unCollapse working okay