Title: Resolution of Curve and Surface Singularities