Junked last weeks work and switched to MapControl API