A Wavelet Solution to 1D Non-Stationary Collocation With an Extension to the 2D Case