Uninstall added.  Baically ready for testing