Merge draw functions into createSurface class